From 9fbd877d35bf01c6ed90dddbe2812fdf0844f93c Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Thu, 20 Apr 2017 00:32:39 +0200 Subject: [PATCH] Update d/changelog, add instructions on how to clean up a bad import --- debian/README.source | 5 +++++ debian/changelog | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/debian/README.source b/debian/README.source index 4a2b5502a..9cc1e9556 100644 --- a/debian/README.source +++ b/debian/README.source @@ -10,6 +10,11 @@ Updating the package $ git remote add upstream https://github.com/rust-lang/cargo 4. $ gbp import-orig ../cargo_.orig.tar.gz If you get errors, check the extra default flags in d/gbp.conf +5. Check that no old versions remain in deps/. If there are, then your git repo + was messed up when you ran (4). Rewind the debian/sid, upstream, and + pristine-tar branches, delete the upstream/ tag; this reverts step + (4). Clean up your git repo, and then try (4) again. +6. Update d/patches and the rest of the packaging, as normal. General info ============ diff --git a/debian/changelog b/debian/changelog index a8a115e21..a8f572735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cargo (0.17.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Ximin Luo Thu, 20 Apr 2017 00:30:13 +0200 + cargo (0.15.0~dev-1) unstable; urgency=medium * New upstream snapshot (git 1877f59d6b2cb057f7ef6c6b34b926fd96a683c1) -- 2.30.2